From: sos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Date: Thu, 26 Jan 2006 17:02:21 +0000 (+0100)
Subject: Merge.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16526
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=5df327098e07feac2e4c2e52026af19246775686;p=xen.git

Merge.

Signed-off-by: Steven Smith, sos22@cam.ac.uk
---

5df327098e07feac2e4c2e52026af19246775686
diff --cc tools/libxc/xc_linux_build.c
index ac0c734aab,11bd3fbc5a..3c80b5e994
--- a/tools/libxc/xc_linux_build.c
+++ b/tools/libxc/xc_linux_build.c
@@@ -250,12 -241,9 +250,12 @@@ static int setup_pg_tables_64(int xc_ha
  
      /* First allocate page for page dir. */
      ppt_alloc = (vpt_start - dsi_v_start) >> PAGE_SHIFT;
-     alloc_pt(l4tab, vl4tab);
+     alloc_pt(l4tab, vl4tab, pl4tab);
      vl4e = &vl4tab[l4_table_offset(dsi_v_start)];
 -    ctxt->ctrlreg[3] = l4tab;
 +    if (shadow_mode_enabled)
 +        ctxt->ctrlreg[3] = pl4tab;
 +    else
 +        ctxt->ctrlreg[3] = l4tab;
      
      for ( count = 0; count < ((v_end-dsi_v_start)>>PAGE_SHIFT); count++)
      {